Remove the dir_thaw_source while disposing the model
authorFederico Mena Quintero <federico@novell.com>
Mon, 31 Aug 2009 20:53:45 +0000 (15:53 -0500)
committerBenjamin Otte <otte@gnome.org>
Thu, 15 Oct 2009 20:06:15 +0000 (22:06 +0200)
Otherwise that timeout may trigger after the model has died.

Signed-off-by: Federico Mena Quintero <federico@novell.com>
gtk/gtkfilesystemmodel.c

index 07f3685bf04a38ab8a6ccae7d5055d1b60ba0609..00a531b61d92fc89ae479f3005759f9cc3a1593c 100644 (file)
@@ -830,6 +830,12 @@ gtk_file_system_model_dispose (GObject *object)
 {
   GtkFileSystemModel *model = GTK_FILE_SYSTEM_MODEL (object);
 
+  if (model->dir_thaw_source)
+    {
+      g_source_remove (model->dir_thaw_source);
+      model->dir_thaw_source = 0;
+    }
+
   g_cancellable_cancel (model->cancellable);
   if (model->dir_monitor)
     g_file_monitor_cancel (model->dir_monitor);